Correct conflicts in previous patch.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1c01ebe1fb8917b59e8de23d635de32b2488432..d8e08eb3258458558a2a4067036b3e0682e281bc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -927,14 +927,6 @@ Enhance `c-parse-state' to run efficiently in "brace desserts".
        * progmodes/cc-menus.el (cc-imenu-java-generic-expression):
        Correct the patch from 2009-11-18.  (Bug#3910)
 
-<<<<<<< ChangeLog
-=======
-2009-11-21  Alan Mackenzie  <acm@muc.de>
-
-       * progmodes/cc-menus.el (cc-imenu-java-generic-expression):
-       Update to deal with modern Java constructs.
-
->>>>>>> 1.16811
 2009-11-21  Tassilo Horn  <tassilo@member.fsf.org>
 
        * progmodes/subword.el: Rename from lisp/subword.el.